TIKA-4745 -- efficiency improvements - #2878
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR (TIKA-4745) focuses on runtime and memory efficiency improvements across Tika’s ML-based junk/encoding detection and some text preprocessing paths. It primarily reduces repeated probe reads/processing, shrinks serialized model representations, and avoids expensive work when it can be proven unnecessary.
Changes:
- Replaced JunkDetector bigram open-addressing tables with sorted-occupied arrays (binary-search lookup) and introduced delta+LEB128 serialization for bigram keys.
- Added a per-detection
EncodingProbeCacheand wired it into detectors to prevent repeated probe reads/tag-stripping across detector chains. - Reduced unnecessary allocations/scans in probe reading (
AdaptiveProbegrowth-on-demand), HTML meta sniffing, and CharSoup preprocessing (marker-gated regex).
Reviewed changes
Copilot reviewed 13 out of 15 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| tika-ml/tika-ml-junkdetect/src/test/java/org/apache/tika/ml/junkdetect/JunkDetectorRoundTripTest.java | Updates tests to build sorted-occupied bigram tables directly (no OA insertion). |
| tika-ml/tika-ml-junkdetect/src/main/java/org/apache/tika/ml/junkdetect/tools/TrainJunkModel.java | Builds sorted key/value bigram entries instead of OA hash tables. |
| tika-ml/tika-ml-junkdetect/src/main/java/org/apache/tika/ml/junkdetect/JunkFilterEncodingDetector.java | Uses EncodingProbeCache to avoid rereading the same probe within a detection. |
| tika-ml/tika-ml-junkdetect/src/main/java/org/apache/tika/ml/junkdetect/JunkDetector.java | Switches bigram lookup to binary search and removes OA mixing. |
| tika-ml/tika-ml-junkdetect/src/main/java/org/apache/tika/ml/junkdetect/BigramTables.java | Updates bigram table docs + adds delta/LEB128 key serialization. |
| tika-ml/tika-ml-chardetect/src/main/java/org/apache/tika/ml/chardetect/tools/TrainNaiveBayesBigram.java | Writes NB bigram model keys as sorted varint deltas to reduce size. |
| tika-encoding-detectors/tika-encoding-detector-mojibuster/src/main/java/org/apache/tika/ml/chardetect/NaiveBayesBigramEncodingDetector.java | Reads NB bigram model keys as varint deltas. |
| tika-encoding-detectors/tika-encoding-detector-mojibuster/src/main/java/org/apache/tika/ml/chardetect/MojibusterEncodingDetector.java | Uses EncodingProbeCache when available to reuse the probe. |
| tika-encoding-detectors/tika-encoding-detector-mojibuster/src/main/java/org/apache/tika/ml/chardetect/AdaptiveProbe.java | Avoids eager 2× rawCap allocations by growing buffers on demand. |
| tika-encoding-detectors/tika-encoding-detector-html/src/main/java/org/apache/tika/parser/html/HtmlEncodingDetector.java | Adds a byte-level <meta precheck to skip expensive decode/regex when impossible to match. |
| tika-langdetect/tika-langdetect-charsoup-core/src/main/java/org/apache/tika/langdetect/charsoup/CharSoupFeatureExtractor.java | Skips URL/email regex scans unless marker substrings are present. |
| tika-core/src/main/java/org/apache/tika/detect/EncodingProbeCache.java | New per-detection probe cache object. |
| tika-core/src/main/java/org/apache/tika/detect/EncodingDetectorContext.java | Adds and exposes a per-detection EncodingProbeCache. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 15 out of 20 changed files in this pull request and generated 2 comments.
Comments suppressed due to low confidence (1)
tika-encoding-detectors/tika-encoding-detector-mojibuster/src/main/java/org/apache/tika/ml/chardetect/AdaptiveProbe.java:79
IOUtils.read(...)can return-1at EOF. The current code adds this tototal, which can maketotalnegative on an empty stream and lead to incorrect stripping logic orNegativeArraySizeExceptionon return. Handle-1explicitly before updatingtotal.
int n = IOUtils.read(tis, buf, total, want);
total += n;
HtmlByteStripper.Result r =
HtmlByteStripper.stripTags(buf, 0, total, stripDst, 0);
int content = r.tagCount > 0 ? r.length : total;
if (content >= contentTarget || n < want) {
break; // enough body text, or EOF
}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Thanks for your contribution to Apache Tika! Your help is appreciated!
Before opening the pull request, please verify that
TIKA-XXXX)[TIKA-XXXX] Issue or pull request title)./mvnw clean testmainbranch. If there are conflicts, please try to rebase the pull request branch on top of a freshly pulledmainbranchtika-bom/pom.xml.We will be able to faster integrate your pull request if these conditions are met. If you have any questions how to fix your problem or about using Tika in general, please sign up for the Tika mailing list. Thanks!